Don't add hyphens in the middle of abbreviations (#15235)

Change-Id: Ic4fea717afa7389a17f82c2adf664f62f8198627