Merge "[automerger skipped] Merge "Guard against missing mac addresses in...
Merge "[automerger skipped] Merge "Guard against missing mac addresses in onWakeupEvent" into udc-dev am: 34f6424c am: 77cc078e am: f3a65500 -s ours" into udc-qpr-dev-plus-aosp