Snap for 9515135 from c392840ee1dd68d75b044ec745811367f91b1180 to mainline-media-release

Change-Id: Ia1380c6b991d0590648076bc1063e4371444619c