Merge "Simplify Javadoc for easier parsing." into pi-dev am: f707c55725
am: 0e34c367a1

Change-Id: I5ed07e3aff0f363190985633e1c0310abd7a848f