Snap for 5735642 from a367e0e4fa7f1eacbf7dbad93f6b3c00cf469587 to sdk-release

Change-Id: I6c869d546573f24d08592e74bc317bdbc5353b78