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

Change-Id: I557bd48c7fc66c79ad4a0befcffd1e6f9e8fe54f


Trivial merge