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

Change-Id: I360b08a8df83570187aad8d7b92d6b5b333c0fee