tree ca6d77dc34d13cf5d7f1a4ee93f5686d48804c34
parent 2e69265781b31753615261217aae41113d756daf
parent ebd849ed8aa77c0e1dad7a08df4a55845a067b76
author android-build-team Robot <android-build-team-robot@google.com> 1518628702 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1518628702 +0000

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

Change-Id: I49964d5bf5f5fe6557c8baa50e91e5bc96ce471c