Squashed commit of A/V changes from CodeAurora