Update glossary

Change-Id: I28efc3de64c9390b3fed53dcd9eb6fb1b1af0490
Merge "Update glossary"