Snap for 7961397 from 3067a416e9e44377a4734c5da86f4738c8e89e7e to sdk-release

Change-Id: I966a1d3c492d103e9b631146e4d575e232871845