Merge "Zygote: Allow arbitrary-length wrap property names" into oc-dev