Merge "Ignore tags in comments that are actually Java annotations" am: af4aca7863 am: bf96a2b37f
am: 6dd6c2cd29

Change-Id: I694745fc76fc502442abea10e04f2f09c091be2d