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)
commit1261f8e224b441e448676db16d00d5d8d0d480f8
tree95d77d49ffa3e447a4ceda5b8072f009adc8b93e
parenta1479f1c7c7b5d737fd13a41b99e725abfc737ef
parentb8356b461c51b1969b35224af4a3d111ebf5c02c
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: 72d633abbd am: 2c3475cb3a
am: b8356b461c

Change-Id: I189332f4d10687f78dd34f04cf3305002a3e541d