Cherry-pick the following missing commits from nyc-mr1-dev prior to b/33090058, which...
authorXin Li <delphij@google.com>
Wed, 28 Dec 2016 20:50:25 +0000 (20:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Dec 2016 20:50:25 +0000 (20:50 +0000)
am: 3d11686e0e

Change-Id: I113f3f7c10bd5ce44b0cfd6ce2d1d0ac8102fc5f


Trivial merge