Move this code to a base class so it can be used in more tests. Change-Id: If8bd605ec75c8ddf8a85bff4e32ceb435aa35b85