Merge cherrypicks of [17800024, 18160003, 18797386] into sc-d2-release.

Change-Id: Ie23f47043791c3af884465de4381225fb9e3fd6d