Snap for 12349386 from 3ef2df78cdc6bc7972271f0828624e3004349ffc to sdk-release

Change-Id: I7c3aede1bab97bcef62fc55558a22b452d360787