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

Change-Id: If15c94b434fcac57085af98a92006355b4b904c7