am 23c7cef2: am 74a0eb36: Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev

* commit '23c7cef2ca28bf3116611507457be953f45ca80b':
  Avoid unhandled page fault cases on Android Wear