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

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