Reconcile with klp-release - do not merge

Change-Id: Id7c794c3695237b64280be2165feca5b5ae37360