tree f548e640ad238d6f0a7cd3f677f08e77c5cb92e3
parent 6873eb9c1229f1e5a66e7b73a62fca05a2174a3d
parent 3056f04d293bd16e56cc72e10edd060b8c1ca0f5
author android-build-team Robot <android-build-team-robot@google.com> 1518628704 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1518628704 +0000

Merge cherrypicks of [3614756, 3614757, 3614861, 3614758, 3614759, 3615200, 3615201, 3615202, 3615203, 3615204, 3614670, 3614671, 3615108, 3615109] into oc-mr1-release

Change-Id: I1915fdbe13dadf2f61171d85610a7d567a6327f1