tree a3c036ea017a5f130937c5647894342c2ad8bdbe
parent d8f66b08ea607fb6c4bcbb8a62a0a99f82d909f9
parent 4ba7d2ec503655357acd6513cd2709934c015d63
author android-build-team Robot <android-build-team-robot@google.com> 1508909489 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1508909489 +0000

Merge cherrypicks of [3122088, 3121430, 3119129, 3119130, 3119131, 3120667] into oc-mr1-release

Change-Id: If407b5d78299ba0be9410de4546042986fd65758