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

Change-Id: Id23c8c2af5ce170f00cf1d3968c56a59d5f168fb