Snap for 8562061 from 44173ea9c2b2ce5ab56e8b2662c8775a1a1ee44c to mainline-media-release

Change-Id: I381d20ff898f349ba7b1df4ff19ad24d5facb899