Merge cherrypicks of [17120225] into sc-v2-release. Change-Id: I2bcc46dcb0a9eed6037ba4e786f44c3de43c77bb