The change is a cherry-pick from klp-dev. The change also fixes the errors found by fixing the tests. Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50 (cherry-picked from commit 89fdc0c556cf0fe2562fb8f0476e03cd51045164)
The change is a cherry-pick from klp-dev. The change also fixes the errors found by fixing the tests. Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50 (cherry-picked from commit 89fdc0c556cf0fe2562fb8f0476e03cd51045164)