Snap for 7195589 from a5de734d52f5afcef99facc25ee70d108d5bc140 to mainline-media-release

Change-Id: I25cc85985de884e23468776131b85c9db7fdb043