Merge "Enhance battery saver event log" into pi-dev am: 639602ef11
am: 8017e8982c

Change-Id: I49e9e0c5511a755887b6f616a3daff105ab230e6