Snap for 13198286 from e38d4b1bd6421b07faa70e558292d6bf6a329e74 to sdk-release

Change-Id: I56863fd3f1ffe795180ab84fd3fd5bec6974f84c