#716 - Missing import statements. Fixing build.
Merge pull request #735 from arvindsv/716_fix_build

#716 - Missing import statements. Fixing build.