[Backport] Fixed extends and removed unnecessary variables#16911

magento-engcom-team merged 1 commit intomagento:2.1-developmagento/magento2:2.1-developfrom

gelanivishal:2.1-develop-PR-port-14395gelanivishal/magento2:2.1-develop-PR-port-14395Copy head branch name to clipboard