Merge "DO NOT MERGE Finalize device-monitoring dialog strings" into nyc-mr2-dev