Merge "Add tests/test-data/ to test file list for Checkstyle" am: aa2ea17237 am: 646db5802a am: a12b72439c
am: 86462d00e1

Change-Id: I76fe3bc4a126382001d9d7a563ebb1b77ea4d90a