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

Change-Id: Ieacde0260faed5d072608df907600205d46a51a3