Update fallback settings

Change-Id: I00c8c7ff7b18d5678f84ec09018e024c666fec8f