tree 71af363e01ad9ad58468f86ba6860f7fa66508a9
parent 745f484e1b3deaf4e5ee11ed6718543684ea33e7
parent cff105b148b7d52155417c0f2e5c63120e1dbea9
author android-build-team Robot <android-build-team-robot@google.com> 1518211704 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1518211704 +0000

Merge cherrypicks of [3594034, 3594272, 3594273, 3594274, 3594275, 3594347, 3594035, 3592471] into oc-mr1-release

Change-Id: Id10da8ecc6f8db7c0ddf6f4e1e3e6bbbd40b1fc7