Merge "Ensure known good state when starting." into nyc-mr1-dev am: e845cf22c1 am: 31ef78878e
am: 4efa787038
Change-Id: Iac79f90b2d884357186ed99cf764da40afbb25d9
This commit is contained in: