Merge "Add test_suites lines."
am: 4e6f3d9603

Change-Id: I5e12282fcd3e5d609f5ef5c47a9218e18d2ecda2