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

Change-Id: I0d894c09ce1d6a96e60160ebd1246cdda4d9f9be