Merge "Remove temporary logging." into pi-dev am: 216b50ad97
am: 1f6cebfab1

Change-Id: I05f5b91406ad73aa8140bf36b1c2381667adcc88