Merge "More correct startup and shutdown procedures." am: 618d4215a2 am: b6588f9a41 am: 7074b562d9
am: 579c86f622

Change-Id: Ia55c27ee51892a7dc29f2e1f1379eb8312cf3cb3