Merge "NIAP: don't do unit test when the User is not primary."