am a8a34453: am 5cdaf8c3: Merge "Fix build" into klp-dev

* commit 'a8a34453a26fa8d852ecddaea1225e3ac9b25045':
  Fix build