Merge "Transition API changes from API council recommendations" into klp-dev