remove specific FORCE INDEX clauses causing trouble

bug: 45619
Change-Id: I6b8f35bd8d709ccc8e4811836e7731bcedb5520c
Merge "remove specific FORCE INDEX clauses causing trouble"