Signed-off-by: Grant Reaber <grant.reaber@gmail.com> Upstream-commit: 42fe72228d Component: cli
42fe72228d