Also small documentation cleanup in a few other places. Change-Id: I16581c751aa0ffa146faba3b140a8fa2170f4520