Snap for 8005954 from a1ae1fbcb13d8253f7d646032259f0e9aa8244e4 to sdk-release

Change-Id: I1e89159ec2ab446f9771caa3cd40da4b7b052d3f