am 31d519fe: (-s ours) am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
* commit '31d519fe37f6132f01b6193fec91d9f9b5b97908':
This commit is contained in: