Snap for 9537280 from 95af516ba1147441d15689c7986ea026e5c1c3f1 to mainline-media-release

Change-Id: I53d9b6870470b3ce6c966ea6fff42c25ddae53c9