Fixes #11630 Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com> Upstream-commit: 7ac28ecb2c Component: cli
7ac28ecb2c