Merge "Convert EventLogTags.AM* events log points to EventLogTags.WM"