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

Change-Id: I292a512e234be1de0dafa100b13798de840e8c5e