Merge "Fix typo with register native allocation." into lmp-mr1-dev