Merge "Fix boot loop issue on Android Wear." into oc-dev