Merge "Add missing @addtogroup tags." am: 95a37079f5
am: a707c482a1

Change-Id: I3a8c878551052c65150492bcd22b96764447edde