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

Change-Id: I636b485c521de13da810bad71484f3780dee2156