Snap for 8952093 from 9fe18a4a65c7b393f268d40c8443a48886d365e2 to sdk-release

Change-Id: I4a1bc3011000d12622a1810c4751f2b371f834f3