am 133c1faf: am 67d7af51: am 19565ad1: Merge "Small print API tweaks" into klp-dev

* commit '133c1faf8c4450c5ad45dea13323d45dfb60817b':
  Small print API tweaks