Merge "Added new tests on LoginActivityTest:" into oc-dev