Merge "Fix typo in FlpHal" into klp-dev