Merge "Update class name for FdnList." into lmp-mr1-dev