BUG=635421, 629679

Recipe-Tryjob-Bypass-Reason: downstream changes expected
Review-Url: https://codereview.chromium.org/2264583002