Merge "Fixing incorrect check in BatteryIncidentTest." into pie-cts-dev