GIT-15 fixes of release-15
Merge pull request #15 from PubMatic/GIT-15

Issue GIT-15 pull request to release-15