GitLab

This roll picks changes which fixes the frameviewer mode breakage
caused by CL https://crrev.com/1007113002. Also fixes an importer
error due to a spelling mistake in the newly added audit calls.

BUG=None
R=nduca, dsinclair

Review URL: https://codereview.chromium.org/1021153002

Cr-Commit-Position: refs/heads/master@{#321592}