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

Change-Id: I7920617a1506817b25ade8e92bfb1945d2f173bb