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

Change-Id: Ic5dae1b3dfb894c2e594832359c4ce3bf2acb5eb