Merge "Canonicalize additional Android-changed comments."