Snap for 12472708 from a325ee8f4d14a1d44022e05d9611d4ade5bfdc2f to sdk-release

Change-Id: Ic7cdeb38a6a3bd08d94eb0b9a574c30f32720a22