am 49ee555f: Merge "Transition API changes from API council recommendations" into klp-dev

* commit '49ee555f239c79871b661e5ff135061f26665e1c':
  Transition API changes from API council recommendations