Merge cherrypicks of [14241635, 14241636] into mainline-media-release

Change-Id: Ifd35e62c87724a2a0db13886c0da317cb43d744b