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

Change-Id: I6b871cebf05f0fe18b054df456aabd80b10336aa