Signed-off-by: Daniel Nephin <dnephin@docker.com> (cherry picked from commit c0ea589c1b27f8b68e84cfe6692a7639da52ce6d)