tree eca2bbb815b2970913b5a33acabfaf6bb27b85aa
parent 699cb9a11b1dce1515a4f591274b90269962cfec
parent ec96bfe26aa1e7f0950fc867a0bc863d3383228a
author android-build-team Robot <android-build-team-robot@google.com> 1506036359 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1506036359 +0000

Merge cherrypicks of [2940345, 2938007, 2940429, 2939599, 2939600, 2940430, 2940431, 2940432, 2940433, 2939601, 2939602, 2940112, 2940113, 2940114, 2940115, 2940116, 2938720, 2938721, 2938722, 2938723, 2938724, 2939603, 2939604, 2939605, 2939608, 2938725, 2938008, 2940438, 2940439, 2938727, 2940549, 2940551, 2940553, 2938335, 2940555, 2940557, 2940440] into oc-release

Change-Id: I0b95c4221119c98bec216f73d93c734b88d7f8e4