Merge "Remove unused logging symbols." am: 081b710b2e am: c9c3128ac5 am: 7ac54f98d8
am: af59892f6b

Change-Id: I97dae2e21d7cc6402aa9bed766c5d7cf3821d48d