Merge cherrypicks of [16816308, 16630867] into sc-d2-release.

Change-Id: Idc39cd605e9fbc1ef5910415f302b8b10a0a2b61