Merge changes from topic "property-trie"
am: c47dd6b5c0

Change-Id: I4a495331fad208e2c6b80b1ae28d5ecb0dc9c820