Merge "Fix exception_test." am: 11d506c1b2
am: 660ae5ad23

Change-Id: I70404f198daadb100df0d0bf7300e4efe5210b87