Merge "Separate servicestests/utils"
am: 5c06c1c061

Change-Id: Ie152d348d9b37abcd77c01758088fd1f6c78afed