Merge "Update service test runner to allow test args" am: 56b92e8191 am: dde9ea21e4
am: 10840d1897

Change-Id: I200c88f0d6d00bef77fe00a59f8e99b3b91f7aa2