Merge "Fixed statuses on Battery Saver column." am: 21e0701f76
am: bb205d5e3e

Change-Id: I3c4e517b25b9e1c709baa11fe8568a8efecafea9