Merge "Added AccountManagerService tests for continuous testing"