Snap for 13198286 from a183e2b92c71d86ec7b104c116ef3f4dbcbb523f to sdk-release

Change-Id: I3a2f644b1042c899bbb5f3948ae7c1bfb68f6c5f