This is separate commit for CLI files to address PR 36054 Signed-off-by: selansen <elango.siva@docker.com>