Snap for 13198286 from 9bd624380d4ed78d441f047365fca6778e49ee0d to sdk-release

Change-Id: I42bde6ef7d8e274a3c5e472b4bec62650a88d50c