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

Change-Id: I7e993f2906e6a9d89c750880e8e3d6eb8f6d5d21