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

Change-Id: I07472d513a48714c8fd73df4b271ded29b15ced2