Reconcile with klp-release - do not merge

Change-Id: Ic55943955deea3d844a22c766f3a389e6793925a