Bug: #1036006
Merge pull request #152 from a-varun/master

Bug: #1036006