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

Change-Id: I8843ee40da3c1835d1c8aa18ecdf990d01aeb00b