Merge "More correct startup and shutdown procedures." am: 0530b1e65d am: 22c6c1a5b2 am: fec0502419
am: 7590d5d5ba
Change-Id: Ia55c27ee51892a7dc29f2e1f1379eb8312cf3cb3
This commit is contained in: