[automerger skipped] Merge "Revert isResolvingImsBinding implementation" am: ae86fa8697  -s ours am: 8e056ed63d  -s ours
am: 481e0d9f5b  -s ours

Change-Id: I3bdcaeac3f3018b07fca6fbb5f7595fa906f2ff5