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

* commit '3ad4f2e72b677e3f7936af17f831bf6cdd95aa69':
  Revert metadata_sync table and related code from M