Signed-off-by: Andrew Hsu <andrewhsu@docker.com> (cherry picked from commit 3c70b56937c415c6bf3516aeaa5231c6d7d3145d)