am 65f8da7f: Merge "Address HCE API review comments." into lmp-preview-dev

* commit '65f8da7f640ef87797fe16d139caa26d55378ab6':
  Address HCE API review comments.