null pointer issue fixed for review
Merge pull request #1472 from ssushma/dev-branch

null pointer issue fixed for review
Merge pull request #1473 from Gooru/dev-branch

Blockers Resolved for 1st Patch release 9