am b2d341fd: am de6b8986: Merge "Adapt to API constant changes" into klp-dev

* commit 'b2d341fdee4072517a7e8f4af259bfe1a2101915':
  Adapt to API constant changes