Merge "Fixed AccountManagerServiceTest"