Anurag staging

The last commit is for my gci task - https://www.google-melange.com/gci/task/view/google/gci2014/5228059913355264