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:56:54 +0000 (20:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Dec 2016 20:56:54 +0000 (20:56 +0000)
am: 3d0f2fb381

Change-Id: I443976f9e012cb0f5c08bd29a03cac5d1b36e493


Trivial merge