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

Change-Id: Id599b6c108b656932343209eb29abb3837b15624