Merge "MediaResourceMonitor: Change argument type from string to int" into nyc-dev