tree 478d2bd2de39f44926a8ea00cb6c9b8ef6d7c00d
parent 325d0b98e8dbd9dcdcb25d8e3c9c5a8366c46ff3
parent 9fe53c1fb27b1da43e75655b688fc5f91935a9b1
author android-build-team Robot <android-build-team-robot@google.com> 1500324576 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1500324576 +0000

Merge cherrypicks of [2550323, 2550336] into oc-release

Change-Id: I789b60319c34837f7da75bd92fd70a748a766626