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