tree 06f581487823347e337fde71cd0222df8eb17b9c
parent f5382a77f1ff69d7fecf6aaf5cd0a5cf1674ffcb
parent eff259b0cef8a76b4bd32945feeee7133da2ed56
author android-build-team Robot <android-build-team-robot@google.com> 1498267533 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1498267533 +0000

Merge cherrypicks of [2455372, 2455337, 2455612, 2455497] into oc-release

Change-Id: Ie2ffaf2b1f80b803134226aa0f884367caf218ef