Merge "Move FDN-specific classes into own package." into lmp-mr1-dev