Merge "Revert "Add mmd_native namespace to system properties"" into main