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

Change-Id: I247686d51b2b3cbc9d6fc57dd8de7adb77f7caff


Trivial merge