resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f am...
authorNicolas Boichat <drinkcat@google.com>
Tue, 22 Aug 2017 18:59:23 +0000 (18:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:59:23 +0000 (18:59 +0000)
am: 670588f810

Change-Id: I402245e7b1b743be1cc862805a0768b67d15e930


Trivial merge