[automerger skipped] Merge "Separate servicestests/utils" am: 5c06c1c061 am: 36ca51ffbc
am: eb545f334e  -s ours

Change-Id: I520b37fcdc51b428f3672ec5a71f02a8499d272c