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:50:21 +0000 (20:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Dec 2016 20:50:21 +0000 (20:50 +0000)
commit3d0f2fb381ae4d59bf7d914df01924f74222871b
tree20e025cb6744fec611794a8d53dae91a261d1c46
parentd4d6d9753b08f09b6fcc85f4941bf6052f1a2424
parent3d11686e0e58b17ed3e96abfbc67e2b52e837b25
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

Change-Id: I83bcf17f51753c8ff9eaf5037e9150e094955305