am 007375d0: am 3ad4f2e7: Merge "Revert metadata_sync table and related code from M" into mnc-dev

* commit '007375d04b398a825e935f5ca4b86ff4853e6941':
  Revert metadata_sync table and related code from M