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

Change-Id: I818dbb1f10bcdf8534f96cae4472965245807e04