Merge cherrypicks of [17034414] into sc-d2-release.

Change-Id: I9aad69a902f6cdb534b6201deb59c5b61832de5c