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

Change-Id: I8f602ee28460b015c936c599bf044f4a75eccb80