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

Change-Id: Ifa51bd9afb4029a209410db0a9f3d2d69ddee18d