Merge cherrypicks of [15765159, 15765160] into sc-d1-release

Change-Id: Ibd5df1f55df84818f715f74fd566ae8760bacca7