tree 06f4faefc2749976d2d6b53944fbe6554ad70dfd
parent c0935935e6967a5760def402b8cc5f4361e9e99a
parent aaf4bfb70c769edb676dcf036259fcaaac86ea5f
author android-build-team Robot <android-build-team-robot@google.com> 1499067450 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1499067450 +0000

Merge cherrypicks of [2489285, 2489286, 2489323, 2489399, 2489257, 2489326] into oc-release

Change-Id: I8b31b1f2eb4108cb522113428dab57e7eda1903f