Merge "Remove unused logging symbols."
am: 081b710b2e

Change-Id: I580bffd9688446839d30bcbd225de59885daf7f2