Merge "Allow empty value in property node"
am: ed9edd2fb1

Change-Id: I2a72491735236fb1138f3ce07cad62c9fe7a1dda