Snap for 8562061 from 3833d03eab641aba628a452cb264c6cbb921f6d8 to mainline-media-release

Change-Id: I3a3d6c9b2ab8e4a41120f9461b6b2f0d27c07325