Merge "Add missing @addtogroup tags."
am: 91a45a421b

Change-Id: I85847d1525dad6115272a120caa4fa2d9631188d