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

Change-Id: Id38573d781ad94c4c8479a1690205db39dd1286c