Snap for 7183507 from c4f4ff9ae0b297148e402103fa3a342cae81cc58 to sdk-release

Change-Id: Ia4af29811f507840bb7e82e73f20c198f033ab60