[SYNC] Synchronize with compat

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