DO NOT MERGE: remove miscellaneous logging
am: 897373916f

Change-Id: I1917dd91694a8edbf1b1f427909bd7e65f63008c