Merge "Make logging much less verbose" into pi-dev
am: 932eb00d24

Change-Id: I68dd78a5bd27554362d4400725a1cc66601aec44