Reconcile with klp-release - do not merge

Change-Id: I24f8921ff681f36104fd1267bc73812ce671c374