tree ed39557debb04047f94a4e475dbbb06a639bdf57
parent f6a78079a81a177a3edebc9980829cbf39bf6655
parent 51b19764051029696bdee0c0c31ec01bd27b3c80
author android-build-team Robot <android-build-team-robot@google.com> 1506036326 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1506036326 +0000

Merge cherrypicks of [2940345, 2938007, 2940429, 2939599, 2939600, 2940430, 2940431, 2940432, 2940433, 2939601, 2939602, 2940112, 2940113, 2940114, 2940115, 2940116, 2938720, 2938721, 2938722, 2938723, 2938724, 2939603, 2939604, 2939605, 2939608, 2938725, 2938008, 2940438, 2940439, 2938727, 2940549, 2940551, 2940553, 2938335, 2940555, 2940557, 2940440] into oc-release

Change-Id: I989155ed7209a97887abe31f615578aa69e06964