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

Change-Id: I48302e70e01fb290634f66bd679268fea0ede22d