Snap for 10453563 from 12f68c351f6540352b8bbe53b468172980d31828 to mainline-media-release

Change-Id: I67edd29c49a76ca3f2f66e0db616dffdff5a34b8