Merge "Bug 6692: clean up MonitorRequestBuilder"