merge in klp-release history after reset to klp-dev
"KRT16N"
KRT16O
Merge commit '8db6d354676c4dab92dd1accf066fd930123e581' into kitkat