DO NOT MERGE - Merge RP1A.201005.006 am: afd3a75664

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

Change-Id: I1a509d022b58567054e8035ff752ee3938ee3fef