Merge change I10036c49 into eclair

* changes:
  b/2296110 Disable debugging/logging code before shipping.