Merge "Fix TODOs of duplicate property names for prefix and exact matching" am: 17574172 am: d90c40a6 am: a0519b18 Change-Id: I82ce0c73fb254ef658b4e6153f6aae2a2f9fa1e5