Merge "Filter the content of the Bundles used as extras and styling APIs" into rvc-dev am: 4ddfdaf6 am: 5c913aea Change-Id: I812531d5bd33a0820afcfde8e78f5c5a356267a2