Part of d615ef34 hasn't been backported to klp-dev yet. Do it now. Change-Id: Ib4f26c64d376e236fa3f76166f5d78a9f28b79a3