Signed-off-by: Josh Elser <elserj@apache.org> Reviewed-by: Tak Lon (Stephen) Wu <taklwu@apache.org> (cherry picked from commit a36d41af739159073a6f4e6143fe26d77760535b)