Merge "Zygote: Allow arbitrary-length wrap property names" am: 11780f1ad3 am: c942ae61e9 am: 85c5e1c123
am: 52fe51d8b0

Change-Id: Iceb651255f6541ff46f7a64092f5f55d27318d2d