tree 53c06d8a97271e8b65d2aa69a4c349f002aa22cc
parent a1531a83fb8f964c6b2ce910fa5a7f4a006c8886
parent dd62f0eb9d13208dd1ef9c000b6cb2a0bfc61550
author android-build-team Robot <android-build-team-robot@google.com> 1503444274 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1503444274 +0000

Merge cherrypicks of [2775115, 2774970, 2775080, 2774971, 2775063, 2775066, 2775357, 2775358, 2774351, 2774352, 2774797, 2774798, 2775359, 2775360, 2775361, 2775362, 2775363, 2774972, 2774973, 2774974, 2774975, 2774976, 2774977, 2774978, 2775397, 2774353, 2774354, 2774355, 2774907] into oc-release

Change-Id: I670e7e2b804b5042c00f816d4cff4f52e0937227