Snap for 10453563 from 4b2f08b8aedab71db1f2cddfe55af5f6c68bc2f3 to mainline-media-release

Change-Id: Ia1aee3e66ce115f92a530b23d9184454750b37a4