Merge "Add a method to sanitize a string to be used as test name" am: c98f3763e3
am: cea29d2783

Change-Id: I6fd4f2bb3276052f19b532ad66b2c757b6b94fae