am dc085ed2: (-s ours) am 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE * commit 'dc085ed2':