Snap for 5735642 from f7ec9f65d471caa05d6abb8691925a25bb1f9e85 to sdk-release

Change-Id: I3d73dd2b38fb7122e8b8dd3894d99548c6fd954d