tree 19d2082c959f0fffe1039d3876ee79d5c0e2bd15
parent 7d951867416234a6f3228eb9d888009184b1d0b7
parent 5bf8fc7edec7fcb8cdacec63cd4dcca29ffbeb38
author android-build-team Robot <android-build-team-robot@google.com> 1503444267 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1503444267 +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: If0b52bacdd9c619f4e145af23360c89902547b4c