Snap for 13198286 from aad9cedd6546140a96fe80ad9dd933598f721c3a to sdk-release

Change-Id: I59ed34100524e27a7c9dde05b73d9e9d1e0b545f