Snap for 8562061 from a06f3e32ddac3d4ed41805756b225eb040844c19 to mainline-media-release Change-Id: I9249f89e2e52d2f9870d6090856b9d06c49e8754