Snap for 13198286 from 47af6b3a03bb462177ca5eb810dee4439d731d75 to sdk-release Change-Id: I370003750afaae6f187c2ce315747470e7d23c76