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

Change-Id: Ica75bc5d4ba41041e2cbd585e953320bddbca956