Merge "Better --unplugged support when dumping battery."