Merge "Skip unnecessary sleep during shutdown" am: e3e4ec7c97 am: 57f94aa4bc am: 0660919ccf am: 7bba2bf2d9
am: 9f37a996ce

Change-Id: Ic05a2309257c16542ba148013695bc8693d21447