Snap for 8132238 from 38733baa0ee7a5818cd60566722bda59f1007a48 to mainline-media-release

Change-Id: I86c7e4d046e792a3534aff8de3936823485bdbbf