Snap for 7183507 from 2bde94d36c3c0e2f20745b91b4d22e90ef85722c to sdk-release

Change-Id: I457fcef5a00bd4a51e577061977b7c97f622753d