Merge "Fix issues in the multiview tests"
authorChris Forbes <chrisforbes@google.com>
Mon, 5 Feb 2018 20:21:03 +0000 (20:21 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 5 Feb 2018 20:21:03 +0000 (20:21 +0000)

Trivial merge