Snap for 10453563 from 30b91e939ec91c180a038e9b8b360fd82e00ab7e to mainline-media-release

Change-Id: Ieee34c92c9a7adf659372504371a8e07ff85f644