Merge "Filter the content of the Bundles used as extras and styling APIs" into rvc-dev am: 4ddfdaf641

Change-Id: I6bf4e92eeac9bcaece4cb5501f644304f3e45fee