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

Change-Id: I01b24e9e687661c87e269edcfa8534db3fad47cd