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

Change-Id: Ib017af2b267689c0833b92c13f29da1d2e69a011