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

Change-Id: I948475149ff683e6183728f5f7f76fc0aab90fdd