tree b63456ffdf4a4228fa5b0b442f5aae5788209864
parent 8924c3d52f89a77d8f1067b85be8e69230638e3a
parent 100a8006a7baab1bb62820eb62577c0b0849fbc3
author android-build-team Robot <android-build-team-robot@google.com> 1503444306 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1503444306 +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: If5a62be15494ffd661dc76cce1978a5c348ff8b6