Reconcile with klp-release - do not merge

Change-Id: I81b4f63de93e75fa9553ffce9c2a8de697ca6d50