Merge "Shutdown device gracefully when net discharging" am: 8b4b218886 am: e9b8d29050
am: 20bd011cd9

Change-Id: Ia89f8a45efdb21ff4519c0f5048c1343d8bade8d