Reconcile klte-common w/ kk44

Change-Id: I7752ceea814efdf558a9222077c6b114e0c1b539