Merge "Separate servicestests/utils" am: 5c06c1c061
am: 36ca51ffbc

Change-Id: I4047dc1dbcd7517ea4b73c8d3135604e24b58820