Merge "Disable battery saver tron log by default" into pi-dev am: dfb99b257b
am: 8d4dbded5c

Change-Id: Ie869029e5178517f4b71a981c57334d5f9ea1b13