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

* commit '67d7af514c2a393cbe886ebf5527a0dc45817cfb':
  Small print API tweaks