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