Snap for 7474514 from a2707050575cdf1c3a3519c0a6bc0535a581c6a1 to mainline-media-release

Change-Id: I11be067442f0eac1d1d39208622c949bbd100914