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: fc1fa1d9
Change-Id: Iaf194f39fcfc58b3f37c719707f34c75ae79bd7d