[SYNC] Synchronize code with compat branch

Change-Id: I9dd3536c997d0e8774f0e6c42ae2119d2c9d3fe4