Snap for 13198286 from f271c7a27e229255340bc7bc93318e4a67e9477e to sdk-release

Change-Id: I53d9e7c7365ec34ceecc9db2e79237a03f9efa87