Merge "Enabling battery manager proto field for incidentd."