Merge "Add NPE check for battery header update."