Merge "Address HCE API review comments." into lmp-preview-dev