Merge "Implement shell commands for battery and activity services."