tree e92f25db27279e9372a286d953df51209c47eaaf
parent aec57fad0dc908019ef2ab23c9b4ae86e32a1f32
parent 801ad647015810abc856f93ff1e90bb930714ec9
author android-build-team Robot <android-build-team-robot@google.com> 1498162309 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1498162309 +0000

Merge cherrypicks of [2445838, 2447382, 2447022] into oc-release

Change-Id: I99c60c8c22735c38d4f69be7da76bf1ea20e0f27