Snap for 11228320 from eebc592ee23940d44db20f78bfb4cdb50533416b to mainline-media-release

Change-Id: I5395f433e7c09324ca77e3002ddfa13690652a90