Merge "cpplint: Cleanup errors"