Merge "Fix crash from battery saver switch" into nyc-dev am: 371aec1e92
am: 031faa05e0
am: 1049b0b7f8
* commit '1049b0b7f8a4447b2f9df4f547ded5e94caa5dbd':
Change-Id: I5418e43649a4d8f6b7effc431a86915869e43927
This commit is contained in: