tree efd304b34fc28d62355227b9bf097c0f8e5f7f23
parent 5ea3becca37c5918187e94a02e6fb76645f27535
parent a481a0b4732b73cc295dc438f8fd8a7191d9d53a
author android-build-team Robot <android-build-team-robot@google.com> 1498251282 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1498251282 +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: I119242c000f401e7004814cc18a9c3778109d521