Tested for: crrev.com/c/, crrev.com/i, crbug.com/

Bug:
Change-Id: I4fcc316f454894acc9177f731dffbeb75ed3e2ad
Reviewed-on: https://chromium-review.googlesource.com/597427
Commit-Queue: Varun Khaneja <vakh@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>