Merge "Support alternate id interface for CPS-E-05 - publicProperties"