Snap for 7474514 from 70e1cac63d9545c24b6667f99813e868f6c75c80 to mainline-media-release

Change-Id: I18eb0b92262925fe50e4368df5f36f1c1df9c3a0