tree 9482e131c5dcebe839de0f9a56f6bfe547574d0e
parent 3a8bbc9b1fb44feb839262ba1ed0c76b7273f6f1
parent 0d01d1756217e8b83974dea7c27570d7a76f1a11
author android-build-team Robot <android-build-team-robot@google.com> 1499991414 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1499991414 +0000

Merge cherrypicks of [2538087, 2538144, 2538145] into oc-release

Change-Id: Ie0e851a7b62602a923ca09c3e463fb9cf0bfb65e