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

Change-Id: I99f4500795ddb84f533ce8b9487da8b1797c8150