Snap for 8888397 from ed1361fda9f40193b7d9cf715bb4b450429f38b3 to mainline-media-release

Change-Id: I4e2ac6d8068f33e8b04a4b9b5c6453d1b4b93f22