Snap for 8152310 from 9d17fac88bc6f809f8737a5d08b15991f7c56390 to mainline-media-release

Change-Id: Ifa204a4aef40e42e2c533d9ecd95ed178744a80f