Merge "Fix LoginActivityTest#testIsServiceEnabled" into oc-dev