Snap for 7890950 from cc9f5e4317a528f016d461871962deeda70ccbc5 to mainline-media-release

Change-Id: I68f8d625ae2753d1dc91359e8d4462d2a05c44d2