tree f72121cf869c54d0e8840524b30e57f5378fb75e
parent 1f804199c4f36f55b4e20b50ac7893ce5d0766bb
parent 11bf817e86c669e820d8a63fd82bad654f2203ab
author Jonathan Miranda <jonmiranda@google.com> 1623702599 +0000
committer Jonathan Miranda <jonmiranda@google.com> 1623702778 +0000

resolve merge conflicts of 11bf817e86c669e820d8a63fd82bad654f2203ab to sc-v2-dev

Bug: 190210234
Bug: 190164147
Test: manual

Change-Id: I155ee7efdbda10c05f87001ac4eaf07017a6d456
Merged-In: I230c33d7e4e1871d8d702737c56c79ce46504b8f