Merge cherrypicks of [16663837, 16663579, 16682031, 16458641] into sc-v2-release.

Change-Id: I8ce0dc7b246a5679496cb09166a636d7d51acddc