Change-Id: I335d4a2cb08c75dc24ef36bdfab51111f87e0762 Signed-off-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit 3aaac8a1f682ecda4d41221e8a836bc5401e3b1d) Conflicts: LICENSE-binary (cherry picked from commit c8db6b1eb2a541af20c4c99c23b627cec2300411)