Snap for 12291954 from dec3793dc1172c3d496d2daf59a50312714545f8 to sdk-release

Change-Id: I6d5c5fa4f231aeeb01baaf6ee9dc9e5ff3b2028e