Merge "Force call the fallback handler."
am: b7969272a3

Change-Id: I0c2893acb1f1aba246a1346775ed6d83f9b45e44