am 9720d5e1: Merge "Remove legacy HCE APIs." into klp-dev

* commit '9720d5e11c5175503b383bd903c68d2408d2bb80':
  Remove legacy HCE APIs.