Change-Id: Ia844af3347db52f9f004892578ba4aefac7dd875
Makes it easier to catch issues like at I839301d05877eb63279c. Change-Id: I22b9af7bf36a256d8363ed96fe42c087e0c8a895
This should make it easier to test, and would also allow other repositories to create an instance of it in a maintenance script of their own. Change-Id: I6a28e184f80eb38b5c25a0be5a9041f0c587c852