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:25 +0000 (20:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Dec 2016 20:50:25 +0000 (20:50 +0000)
commit72d633abbd3ec2a4cdc2461974c72c2f2c7c119b
tree44d34133bc3a46231a9580b071851c69ca1e4a63
parent399626de906e4cc52186511b5dbf2abe38684554
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: I113f3f7c10bd5ce44b0cfd6ce2d1d0ac8102fc5f