[SYNC] Synchronize compat with core

follow-up for https://gerrit.wikimedia.org/r/#/c/94701/

Change-Id: If92c948f0184dc8e84528d807d53f25d417c82d0
Merge "[SYNC] Synchronize compat with core"