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

Change-Id: Iba1f8ec62784f68bc415690ccf5966445c9b3542