tree c2556d96571af293cec7d5c9ede43f237ec8101a
parent 1f0137ce088e51b8f35fd9f7a9c8b6ea42c17db2
parent 853f8b4c74bc07895728103fd76384300e66e8f9
author android-build-team Robot <android-build-team-robot@google.com> 1503444312 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1503444312 +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: Ic286caa64fb4c8419d434af8146351fef5642b34