Improvements to ByPropertyIdArray and its test

Change-Id: Iacadca5eb72325e07901aab6a422673733b6bf65
Merge "Improvements to ByPropertyIdArray and its test"