Merge "API Review: Define the extras as containing CharSequences, not Strings"...
Merge "API Review: Define the extras as containing CharSequences, not Strings" into rvc-dev am: 05425809 am: f23515ae
Change-Id: Ia59ef9d9c756f644d474ac008c3ff0ee27e781f3