Reconcile with klp-release - do not merge

Change-Id: I11d427fe49ec6cb012b0176734dc245eabd5f50b