Merge "Refine recode apis." into lmp-dev