Merge "More correct startup and shutdown procedures." into nyc-mr2-dev
am: eede3e7f7b
Change-Id: Ib017af2b267689c0833b92c13f29da1d2e69a011
This commit is contained in:
am: eede3e7f7b
Change-Id: Ib017af2b267689c0833b92c13f29da1d2e69a011