Merge "Make more ContentHandler replaced hooks emit deprecation warnings"