Contributed By: Viraj Jasani Conflicts: LICENSE-binary (cherry picked from commit 4f6ebabdba885d2e21ba232b6def3adbaac1a584)