am d7c97a79: Merge "Remove misleading warnings." into klp-modular-dev

* commit 'd7c97a798f25d54a00adc0cfb2af4dedd5a4e3f2':
  Remove misleading warnings.