Merge "Revert "Relax HasSeenMethod check"" am: 9f3a7c5e59 am: a7cf9c4115 am: c0d01023a7
am: 80c21b5264

Change-Id: Iec69dd7ff4fd5dca6d5476216309ec695e47d39c