Merge "Revert "Temporary fix for build bots: Set verbose always true""
am: 20741891ab

Change-Id: Ic02f31007182c33c165cecf5d9381a2cd03a4922