Snap for 7183507 from b53fd14410791f9e3ee8c70ee3aa9a1501c1916c to sdk-release

Change-Id: I90e696d035ef294e931b36c3d14e584e286b7d5d