For some reason some of these issues were only detected on
recipe autoroller bot.

TBR=iannucci

BUG=693058

Change-Id: I5d4a1243850a31d5430f2dc07be4a5138551ef82
Reviewed-on: https://chromium-review.googlesource.com/444884Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org>
Commit-Queue: Paweł Hajdan Jr. <phajdan.jr@chromium.org>