Snap for 8005954 from c38ef056f0aa8774a663df99b253e94436ac0fc9 to sdk-release

Change-Id: I12e8db580e77fe9837feaf0cbf7caacb920f6ca7