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

Change-Id: If72b69832ce407b85a826fb6d00ffd93b17116a1