[Forwardport] Correct return type of methods and typo correction.#16224

magento-engcom-team merged 3 commits intomagento:2.3-developmagento/magento2:2.3-developfrom

saurabh-parekh:2.3-develop-PR-port-15993saurabh-parekh/magento2:2.3-develop-PR-port-15993Copy head branch name to clipboard