Merge "Zygote: Allow arbitrary-length wrap property names"
am: 11780f1ad3

Change-Id: Id1454ecd597347d5fca5f06a17df26e7303c59db