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

Change-Id: I5e3336c3f2c9de5a746c668893ddaefa5e5e57fc