Bug: 235907074 Test: Boot and check cpif does not boot loop Signed-off-by: Jonglin Lee <jonglin@google.com> Change-Id: I9347b29f945c438d2d9c206d56cfa172891b5c18
Bug: 190331325 Change-Id: I6642f426ba77ea6bfa661d7eb88884df48f7b3ca