Merge commit '62ec8db290696304ca5295ab89149410256d6458' into rvc-d1-dev am: b1ce141776

Original change: https://googleplex-android-review.googlesource.com/c/device/google/wahoo/+/11907854

Change-Id: I3e488fd3da0801fd1e7e0e6e93c7b968ae22cdd6