Reconcile with klp-release - do not merge

Change-Id: I104b4a186af085b6a7a5f7d64f4dbb3dfd5aeb01