Bug: 33166666 Test: gerrit uploader Change-Id: I51164be629d10a1a6bd99f3d353eaa700b20af42
mentioned in commit 20a598c6