Merge "Changed text "NFC & More" to "More" and other minor text changes" into lmp-dev