Backport part of d615ef3477da23e7fca9c13b6d63915992e63d2d to klp-dev

Part of d615ef3477da23e7fca9c13b6d63915992e63d2d hasn't been backported
to klp-dev yet.  Do it now.

Change-Id: Ib4f26c64d376e236fa3f76166f5d78a9f28b79a3
2 files changed