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:48 +0000 (19:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:09:48 +0000 (19:09 +0000)
commit4c3a24c0ae943979b7ebbc081ae31bd44149cd5f
tree95d77d49ffa3e447a4ceda5b8072f009adc8b93e
parent1261f8e224b441e448676db16d00d5d8d0d480f8
parentdbf8a43c5d21626489482a588ffe69b41d3204d6
Cherry-pick the following missing commits from nyc-mr1-dev prior to b/33090058, which was lost as a result of merge 01c922fc267ea41cc1c6cb83cde7ba6da200dc38: am: 77f62518ec am: 3d11686e0e am: 3d0f2fb381 am: ed086fd003
am: dbf8a43c5d

Change-Id: I13a79cf86bb5691d28333c7f507d29d1a68579fc