Pod spec updated for new version.
Pod spec updated for new version.
Merge pull request #7544 from yalnazov/upstream_master

Upstream master