Merge "Support Alternate-Id for CPS-E05 id-searches and searchCmHandleIds"