Merge "Reset model when we get an exception." into arc-apps
am: 8107d744a2

Change-Id: I5766815ba13f2a1f672039e38aeb4d58e610bc2e