Merge "Add a name for all test suites" am: b773897b01 am: 4a2a6c537f

Change-Id: I16fc4f61b3edd868307186b6c8ae6be9e63ad86f