Merge "Relax HasSeenMethod check" am: c9267c4897 am: 9f6035f515
am: 257421b490

Change-Id: I742e2cfb5fe614fe1a0da401359fc255ccb11fb6