Avoid infinite fallback loops

Follow-up to I144dacaf36

Change-Id: I72868fb866c53388bb839990b0bb303358410126
Merge "Avoid infinite fallback loops"