am 892c8f3d: (-s ours) am 09848031: am b8160401: Merge "Fix the build" into klp-dev

* commit '892c8f3d633301b2c6efa5ca38dd375c907612a3':