tree 1391c8af7f79a12c0beb3451d24ea2e8741a8d48
parent bdde76caec51721029dff7cae3519bdb116128ec
parent 65623f3b503c95fff3e322c7bdd9ebc289a5fae5
author android-build-team Robot <android-build-team-robot@google.com> 1505151517 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1505151517 +0000

Merge cherrypicks of [2877873, 2877351, 2877352, 2877353, 2877568, 2877569, 2877069, 2877070, 2877071, 2877072, 2877874, 2877875, 2877876, 2877877, 2877878, 2877570, 2877571, 2877843, 2877844] into oc-r2-release

Change-Id: Iacdf5893ae94e68fc793092edc05c954b51e5653