Merge "[automerger skipped] Merge "* DO NOT MERGE * Fixes crashes on Watch device." into oreo-mr1-cts-dev am: b1e960a327  -s ours"