[CDH5] Fix merge conflicts.

Change-Id: I50217656f3a16ef53a788658c4e39f220e69f96f