Snap for 7183507 from 4ce34f22a26324c1f70b1d9e38619ce08ce11e80 to sdk-release

Change-Id: Ia6e8e7cf9e10405d76a13f0960a63a3740062f2f