Bringing in bug fix from internal git
Merge pull request #658 from bhariharan/smart_sync

Consolidate all constants in one place
Merge pull request #659 from bhariharan/master

Bringing in bug fix from internal git
Merge branch 'master' into unstable
Merge pull request #660 from bhariharan/unstable

Merge branch 'master' into unstable