Snap for 8952093 from b272b6f8e10e091b110ddfebe6d51099e6ab529f to sdk-release

Change-Id: I84b6d223e03b3df9538e093f7b51b428c9ce66fa