tree bf659e3a79da0f59f67084847dd1aebe3526bfea
parent 8ce4cb04b0b8d6ef537b55eaff813d4ff7840946
parent 1f29df6eec6cf5b062a9314c77407684a82f8fee
author android-build-team Robot <android-build-team-robot@google.com> 1503446720 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1503446720 +0000

Merge cherrypicks of [2775117, 2775364, 2775365, 2775366, 2775118, 2775759, 2775760, 2775367, 2775368, 2775731, 2775732, 2775369, 2775370, 2775371, 2775372, 2775373, 2775374, 2775375, 2775540, 2775541, 2775819, 2775820, 2775747, 2775748] into oc-r4-release

Change-Id: I3c24b7151af661127598df86cc217221e19a3880