Snap for 12574852 from 31d41782d68f12085402be5fa1223c902bf2810d to sdk-release

Change-Id: Iec5d498aa76e076f74eb1408c57a5f6481a14a57