Merge "Revert metadata_sync table and related code from M" into mnc-dev