Snap for 10453563 from e3b913f679647534152b51aed8f2338fd746f369 to mainline-media-release

Change-Id: I180416b35d812533beb79f87614c1a5271e0d00d