Snap for 7183507 from c3d69e1789b5a2fc067cf87c6a6683305a7955ee to sdk-release

Change-Id: I85e905d20a7d7f8ebf762a7152e49a0aad052396