Merge "Changes test behavior to not have to support blank property names" into tm-dev