Snap for 11035523 from 0a6fde6ce01e07dc8ce214bc7c85539a567b03a5 to mainline-media-release

Change-Id: Ic1e527a54b18c471b80f9bd54ea9d88a42dc9a0d