am 199d1403: am d8d85880: Merge "Fix build" into klp-dev

* commit '199d14032ebaa03a076eceaa9eaacfe37bb8ee93':
  Fix build