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

Change-Id: If7b42e6c5439a1e3e0c91f6ea6a1031806bb69cd