tree adb31c1db205db9233f38141b3847ea09236cd7e
parent 757a03843c7ef83296e525377cd6943330a96c25
parent f7e966c32685b040c55b3b21510a1fa463b2eff9
author android-build-team Robot <android-build-team-robot@google.com> 1501345243 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1501345243 +0000

Merge cherrypicks of [2627701] into oc-release

Change-Id: I13dba40107ad2acef7dbe717fcd01f39dbc9ad49