Reconcile with klp-release - do not merge

Change-Id: I427a690248ab49aca987347b18f08ec0aabe38b9