Merge "Support for Bundle in AudioAttributes" into nyc-dev