Snap for 13198286 from 9d2ce34d0a769c636f635ea87e5941debdc0cdce to sdk-release

Change-Id: Iaf2f39eb9437d879efafab077547375021d2f077