Merge branch 'charger_detect' of https://github.com/rondoval/hammerhead into nightlies