Merge "* DO NOT MERGE * Fixes crashes on Watch device." into oreo-mr1-cts-dev