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

Change-Id: Ia76c7761357b69a672520464d39d4b618f8359b5