Merge "More correct startup and shutdown procedures." am: 618d4215a2
am: b6588f9a41

Change-Id: I8a2bcab3b9373d2573601fa3bffa123020b3fbae