tree 1192a3fb7c48907d4dc33db33bc74a976b1a6954
parent 7fb2578e9dc43d7b7c052f0be838025edcfa5ec2
parent c9935cbce48c19b403eb479590dd9a1a2e01aaab
author android-build-team Robot <android-build-team-robot@google.com> 1501276984 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1501276984 +0000

Merge cherrypicks of [2624661, 2624224] into oc-release

Change-Id: I37c6e10bca102f2cea44717868c3aac4267ad02e