Snap for 13198286 from a6b913871db537bb0e750738fc2feb12bdd667a0 to sdk-release

Change-Id: I36e5737035818dd95c68455948575083f0fca7cf