Merge "Add the test name that is too long for diagnosing issues."
am: ec577e766b

Change-Id: I9b69a836b9bc8982111d8367edddb82b465a92e6