Merge "Fix boot loop issue on Android Wear." into oc-dev am: 5f9fde884b
am: f08388e8ea

Change-Id: I5c61dfb5166e4456f55ef79a122c8fc0b312ed86