Merge "Merge \\"Fixed statuses on Battery Saver column.\\" into nyc-dev am: 24b2e7bbee am: 28318faf16" into nyc-mr1-dev-plus-aosp