Merge goog/master@c8da37c into stage-aosp-master. am: 38365a1634 am: e1fb5fe7df am...
authorXin Li <delphij@google.com>
Tue, 22 Aug 2017 17:21:11 +0000 (17:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:21:11 +0000 (17:21 +0000)
am: 90ff3617d5

Change-Id: I2aa4fee5f66a65b28e062157e9199b8a40371b8e


Trivial merge