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

Change-Id: I6374537ffa905aa19829fd6ebaa0c3143cacca52