Merge cherrypicks of [17043352] into sc-d2-release. Change-Id: I87f4ad0a97f4adda889009307ae1ac0d4fb20b09