Snap for 10453563 from 3e92abfbfe16baad364fafce8b86d28481b2a50a to mainline-media-release

Change-Id: I22103de49e42490535a2d8a8c8d292d2703510c6