Merge "Don\'t make this script fail a buildbot run." am: 8ff01690eb
am: da7db28617

* commit 'da7db286173fc068a9528399a9d5aeb174ad3f84':
  Don't make this script fail a buildbot run.