Snap for 7487883 from b4a181f1ae3e9c146b05db6cfd71770aa4d423cb to sdk-release

Change-Id: I37c6d1b6e3f15057dcc6e9e8ca676e7f057352bb