Merge "Adding a missing change to fix the build." into jb-dev