Snap for 12847752 from 001c881211ff6ef928e8c5390a8707997acae3c7 to sdk-release

Change-Id: Idbce625af3435a48fdc95a15bd856097c448af55