Merge topic 'cleanup_doxygen'

404d9b79 Updating doxygen documentation.
Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I8612e7344d082c89308939f30e71581e88b1aa76