Merge "Cherry-pick the following missing commits from nyc-mr1-dev prior to b/33090058...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 28 Dec 2016 20:57:01 +0000 (20:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 28 Dec 2016 20:57:01 +0000 (20:57 +0000)

Trivial merge