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

* commit '66b5a58a6850cbf3a3fdbb8df913f0fc5ea5bdaa':
  Fix init order so we have something to measure.