am 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam"

* commit '1afedc4d99acd52f99221d71b3a372a0a5497a84':
  Temporary workaround for log spam