tree 219d2e73c4cbcf8eb83647ed959b63bf087ece82
parent 9235f933d96443e5fbecb95db68d94d12c5f913e
author Bill Yi <byi@google.com> 1635286128 -0700
committer Bill Yi <byi@google.com> 1635286128 -0700

Merge cherrypicks of [16013343, 16015727, 16015728] into sc-d1-release

Change-Id: Id1e4bdcabae439f7c93428a67225f99f6cfae87c