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

Change-Id: I4de7548e33d5fa8897a76e96d867c4d6794ed1d4