Upstream changes fixes a conflict with textproc/scim Some cleanups PR: 237839 Approved by: Samy Mahmoudi <samy.mahmoudi@gmail.com>