am 5d0c689b: Merge "Logs to track bug 6765842." into jb-dev

* commit '5d0c689b9b98be1b9be4d535ddb6f73142fd9b25':
  Logs to track bug 6765842.