Changes made for common build
Merge pull request #1 from khyatidesai/K2

Changes made for common build