Snap for 13198286 from 8672f1cb661c2c9b776078af1ceff887a7842c17 to sdk-release

Change-Id: I3db7230945ee54d12ebc13a903a47b27fd2215f2