Snap for 10453563 from 34e7e11ec02e65d0dd78bfe89c5de2c769a5be2b to mainline-media-release

Change-Id: I564d76381f348cee6cce417c42d0a6e39e0954ba