Snap for 8562061 from add50186ecbe274faa395ce13a790e94a524b408 to mainline-media-release

Change-Id: Ieffdc9f597cdf9e9c3d5d0794323e28c088df156