I have a pull request for these changes upstream: https://github.com/CLD2Owners/cld2/pull/50 MozReview-Commit-ID: LUqrA4Genv0