Merge "Work around issue #65333586: Took phone out of pocket..." into oc-mr1-dev
am: f04b643ca8

Change-Id: Ib788a6ced4e7463f2696ac31362274f88192793d