Snap for 12349386 from 06395933a9c7a2f084e0a0e51947700cba22b6d9 to sdk-release

Change-Id: I87eb78d2c79409fff810d414a3ef6c2248289b46