Merge "Add missing @addtogroup tags." am: 16207d9a08
am: d934ff975d

Change-Id: I31e11941b8914333d4f78c99bf677a38a4b57ff2