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

Change-Id: Ia95f634fea1966bfb9ca32001400a6e046f4ad10