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

Change-Id: I1afc07ea0378fb89d9a0ae28b470bcbeb961d8db