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

Change-Id: I95b368fb87cfa63c195b7f9fa6add6ffbb6dedf8


Trivial merge