Merge "do not link hidden intdef in the comments" am: a79188986a am: ebe6360ccc
am: 6e6268f6cb

Change-Id: I80b7fc0ef2b51cde24eb5ef416f30b38e5aaad27