Reconcile with klp-release - do not merge

Change-Id: I4ba33cf9c61be55244f3802734a9ca715c2c0c44