Merge "Allow shell to access battery info" into nyc-mr1-dev