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:43:51 +0000 (20:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Dec 2016 20:43:51 +0000 (20:43 +0000)
am: 77f62518ec

Change-Id: I94b4ddb18d2edb47a336ef1d43ad4df00a210afb


Trivial merge