Signed-off-by: Logan Johnson <loganj@squareup.com> (cherry picked from commit c0ce9204d3e400dd936b62d649e32748fe464ad7) Signed-off-by: Logan Johnson <loganj@squareup.com>