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