tree 6420633e7c95a0ec37c83bc656215f0eedb412ba
parent 27772408e2372f77af264c77be945a7bc2fc910e
parent faa258541de513112bdc41836f2320c64671547a
author android-build-team Robot <android-build-team-robot@google.com> 1498251239 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1498251239 +0000

Merge cherrypicks of [2454758, 2454859, 2454837, 2454965, 2454984, 2455001, 2454760, 2454860, 2454838, 2454899, 2454970, 2455005, 2455027, 2454973, 2455006, 2455061, 2455007, 2454914, 2454987, 2454974] into oc-release

Change-Id: If5de23e18cf90ba248db649e8ba1981a5497ac59