Merge "Fix malformed Javadoc." into pi-dev am: 3ae3f252b4
am: 3d54533e52

Change-Id: I8940755ed359d4fcf6683c59c0e501c11faa4559