Merge "Allow battery voltage to be -1" into main