@mbtobeca that code was part of a bug fix commit cherry picked from the 3.5-dev branch into the 3.4-dev branch. Cherry picking commits from one branch to another sometimes causes these build issues. We pick them up next time we compile the 3.4-dev branch.