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:56:54 +0000 (20:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Dec 2016 20:56:54 +0000 (20:56 +0000)
commited086fd003251af2a4918e920ba4ea15f83a9e22
tree44d34133bc3a46231a9580b071851c69ca1e4a63
parent57b0f45347dbd9ab2104d82172bcc590e4f67692
parent3d0f2fb381ae4d59bf7d914df01924f74222871b
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

Change-Id: I443976f9e012cb0f5c08bd29a03cac5d1b36e493