Add additional checks to NoClientOrRepoUsageTest

Change-Id: I22998fe4c704ce6d238ddd630faf1915d2149b2e
Merge "Add additional checks to NoClientOrRepoUsageTest"