Merge "storaged: exit if batteryproperties service is dead."