Merge cherrypicks of [15987951, 16128023] into sc-d1-release.

Change-Id: Ic60cb83f860c7a7cdd54088de4943ce773501f2e