Merge "Temporary fix for build bots: Set verbose always true" am: 4c9c570545
am: e426e6b87f

Change-Id: I56b1534916ed20507e335c3081973c64e127f798