Fix issue #2300232: Bugs in resolving conflicting pointers

Change-Id: I7b9328c7a1c4f6b731e64cdca2ed9de71b84587f
1 file changed