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

* commit '355c13d294a6c572637571d7df6369916e92394d':
  Fix init order so we have something to measure.