Switch-interpreter: Add flatten attribute to handlers. am: 27351be1c1
am: c7e548ba71

Change-Id: Ib82aade635b546037f86a0ba85bf38a2435fd831