[automerger skipped] Merge "API Review: Define the extras as containing...
[automerger skipped] Merge "API Review: Define the extras as containing CharSequences, not Strings" am: a8ea0822 am: 78837f75 -s ours
am skip reason: Change-Id I7c6f4c13e6267a3e643ebae77697ea18ee8cd242 with SHA-1 2fa6a99e is in history
Change-Id: I75c18747e2d4a012a018880c3c1fa861f867b634