Merge "Give DeviceStorageMonitorService it's own thread." into oc-mr1-dev