fix merge miss (charlie)
fix merge miss (charlie)

ElementsProject/confidential-assets-demo,ElementsProject/confidential-assets-demo,ElementsProject/confidential-assets-demo,ElementsProject/confidential-assets-demo