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

Change-Id: I4a988bbdedce5aed3871cb16ceec97c12896b944