resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f am...
authorNicolas Boichat <drinkcat@google.com>
Tue, 20 Dec 2016 22:34:24 +0000 (22:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Dec 2016 22:34:24 +0000 (22:34 +0000)
am: 53e70a911c

Change-Id: Ie8639f12c0a664c24011c35d16259c0ca7ffe568


Trivial merge