Merge "Merge "Fix LoginActivityTest#testIsServiceEnabled" into oc-dev am: 81c591b77e am: f9eb60458d"