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

Change-Id: I0ac705aedcd941d7c514ab78ef859392d9e72bcb