Bringing in bug fix from internal git
Merge pull request #659 from bhariharan/master

Bringing in bug fix from internal git