Merge "Minor JavaDoc additions and some long line fixes." into gingerbread