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

Change-Id: Id2861e50a61e5683d7a697553309971a1fe3ca05