Merge "Remove a stray empty line." into honeycomb