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

Change-Id: I6fdb61d652acba14c8e66bdfce0019701d8bb465