Merge "Remove SystemBatteryConsumer" into sc-dev