Merge "Fix init order so we have something to measure." into mnc-dev