ea3cdfad1f
Do the link cleanups and update a handful of things that were out of date. Change-Id: I758027bf3577c66cfb13df963516823a5c247080