tree 3a81683832a2e1d75d06598e3e0b86548747fb0d
parent 89becc539f7e1184bc0260ebe51e880ae807b384
parent 18da5a5945ff299023f8ebdcb8f76daf0d042d64
author android-build-team Robot <android-build-team-robot@google.com> 1502990630 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1502990630 +0000

Merge cherrypicks of [2749914] into oc-release

Change-Id: I6d252bf421bf47f64c640599abfb08389fe40b86