Merge "Fix boost charging, also expose test API"