Snap for 8005954 from 9962dd71e5531d993132afa4f3ebbe93f24834fb to sdk-release

Change-Id: If2d04c7247220ed7edc3e2f2e2d42cb4b6c99d95