Merge "Quiet run for nightly fuzzing (and some minor edits)"
am: 536e54a6af

Change-Id: I28a1cc222c0870e36e6b9000b518c3c3c92aec4a