Merge "Update soundscape for L, using classic names." into lmp-dev