Snap for 7183507 from 2188055b689f093e1e3a439a935cda2f2f44ab42 to sdk-release

Change-Id: Ifb689e1d9e477350524d8349591843359463cb53