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

Change-Id: I91693c87ffbd94727b38aaeef32f00485f643582