Merge cherrypicks of [2374621, 2374525, 2374320, 2374526, 2374587, 2374550, 2374624...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 8 Jun 2017 00:37:00 +0000 (00:37 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 8 Jun 2017 00:37:00 +0000 (00:37 +0000)
commit2139b6178fd36e469babbf64d844c1df2e509764
tree8ec4d10ae2104900b21f7feed4a5d5798ae06237
parent9bd18b2f443b05496acebbc1d77291b6c1cae726
parente024e21be8f3a5e5ab22387d09c13b555de72a44
Merge cherrypicks of [2374621, 2374525, 2374320, 2374526, 2374587, 2374550, 2374624, 2374527, 2374433, 2374551] into oc-release

Change-Id: I3eb39ce6323e504acbe6e61086c62465ccd5b3e2