Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev