Merge "Delete unnecessary logging code." am: 47429adac4
am: db0f8b54b6

Change-Id: Ia038a735131b1f6c4a2db78feaa1c66c13bcdc0d