Fix Linker errors in Titanium
Merge pull request #12 from vishalduggal/TAG-538.11.1

Fix Linker errors in Titanium