Snap for 7962046 from ce45360d5aa7c2bb30c64ac55f0bb5bdad05ba36 to studio-chipmunk-release

Change-Id: Idfe2d50b7f4c19e134d3e215a19d34408ce4b25c