Merge "API Review: Define the extras as containing CharSequences, not Strings" into rvc-dev am: 0542580955 am: f23515ae6e am: 5f8464d474

Change-Id: I5eefb9867071efe2149e4a05b1b15953001bac1c