[SYNC] Synchronize with compat

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