Merge "Address Robin's code review comments in initial FlpHal submission." into klp-dev