Snap for 10453563 from e52af4761e6fc732bee08f4fe76b67c964a1f311 to mainline-media-release

Change-Id: If69e0db8b2cb5e7c01856627d56204c0b47d53dd