Bug: 33166666 Test: gerrit uploader Change-Id: I0af85e587c836439e9412e1f1469cf8dbfc17632
mentioned in commit 60902394