Snap for 10406963 from 698232f3caf073c43aa02f2331690d9031aec0e9 to studio-hedgehog-release

Change-Id: Ie3322215dda6a326a439d1b662799ea51f15723b