Snap for 7183507 from 1e92575ee239748dfed46e726b4d5259902700fc to sdk-release

Change-Id: I68d6d304f745c3f1653ce02120cf852e958a11b5