Merge "Revert "Track update count of IMMS#mMethodMap"" into main