Merge "Update turnBatteryOff to include changing charging status too." into pi-dev
am: 4ca791b07b

Change-Id: I96a16ae67e7186e710323a3f9760df341a647704
tree: d64afb0cc765bae7d0d39e895d7a767a5a704d29
  1. tests/