Merge "Define more things to improve doxygen generation." am: c04410ed69 am: e63cb6ffc5 am: accc9ca58f

Change-Id: Ib59a3adbb5aea009da392ccfb555be97bdc16cb5