Merge "Fix javadoc build break s/line/link/" am: 5cd89ebb01 am: 7d2cbc1253

Change-Id: I2debe1dca84bbe175be89686f746bf19f785dda9