am 36b077d5: Merge "Eliminate some accidental log spam.  (DO NOT MERGE)" into honeycomb-mr1

* commit '36b077d558727ead246434b08de0ce7b955508e1':
  Eliminate some accidental log spam.  (DO NOT MERGE)