Merge "More correct startup and shutdown procedures." into nyc-mr2-dev am: c8059fb94c
am: 208336e710

Change-Id: I1385649a71bdba3f19fd863bd4a3ace66d56b568