Merge "Csit-Honeycomb job for 17.01"