Bug: 226869868 Test: build pass Signed-off-by: Carter Hsu <carterhsu@google.com> Change-Id: I3917a43c265dfd8ecfcbc3535ca79fffac1ceb5a
based on pipit 68a0b4b411e8d23dfd966d24a5c35ea4ffb9d5f1 and cheetah 9acaa7507c23ffc7ca5f82a9579dd3a7c56af809 Bug: 206057564 Change-Id: Id59ed48d2a39c9a5a811c41157732914f3568d51