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: I93daf5468b052877ca467402c78815be9e599166