DO NOT MERGE am: 80d7d66dba Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito/+/12617826 Change-Id: I9283e0dd63dafaaa2411fabdf73a1d689dcdfbcb