Merge "Removed symbol causing compile breakage." into jb-mr1-dev