Cherry-pick the following missing commits from nyc-mr1-dev prior to b/33090058, which...
authorXin Li <delphij@google.com>
Tue, 22 Aug 2017 19:09:27 +0000 (19:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:09:27 +0000 (19:09 +0000)
am: b8356b461c

Change-Id: I189332f4d10687f78dd34f04cf3305002a3e541d


Trivial merge