Merge "Turning print proto dump back on." into pi-dev