am afa1231e: am b6da9115: Merge "Remove incorrect warning." into klp-dev

* commit 'afa1231e75f8808f17eccdef51bce98100364521':