Fix regression that made button click be treated as link click.

Change-Id: I335e25d9048803e0127558d22f1cdb088425f07f
Merge "Fix regression that made button click be treated as link click."