Merge "Fix multiple defined symbol errors"