Merge "Convert all comments into "doxygen-ready" comments." into oc-dev
am: 8074912d8c

Change-Id: Ic81578a5730c614e31c529b04fe96a2852da89ea