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

Change-Id: I5b1d06cb5e6d4ba1023da39f0150f21dde96a6ec