Snap for 7621631 from e81a05f05d3cdb4f438aa34bee44001d610d6666 to sc-release

Change-Id: I5c222dd0f89351d6301fd60977980094538d4e16