Snap for 8562061 from 2aaa9747aa9edcf133411e2c7d5d87fd7a50ebdf to mainline-media-release

Change-Id: I1d3ae8024085e0dbebf58786cc83f8cc3d88ea83