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

Change-Id: Id8a60a60ffdb66114a9ae13d3d30df84bd6d85e5