Snap for 9627198 from b0915ceae9262d08d19fb370528e6aa602897519 to mainline-media-release

Change-Id: I4dfe2740b6e124dd7008b90465867205d50f848c