Merge changes from topic "multiview" am: cbc74ae174
authorPhilip Rideout <prideout@google.com>
Tue, 16 Jan 2018 20:27:14 +0000 (20:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Jan 2018 20:27:14 +0000 (20:27 +0000)
am: 07c43c7958

Change-Id: I759d4531a2cb66cd0888cc4f38c2597157144b71


Trivial merge