Snap for 7474514 from c9e0a669bf9267447aa6fc6533ab9f798e8255ae to mainline-media-release

Change-Id: Ia1dbcef6322f9e90fb1fe719914f386b1acdbe06