Signed-off-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit b90389ae9840ccfdcab411e286547895a647feed) Conflicts: LICENSE-binary