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

Change-Id: Ib9323130c859df5c1158cd8bbcae7775320b9809