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

Change-Id: I557bd48c7fc66c79ad4a0befcffd1e6f9e8fe54f