Merge "Add Honeycomb 18.01 branch"