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

Change-Id: I0dbccffda96f5f8285f4968768ee0aee4e972a91