Merge "Fix exception_test."
am: 11d506c1b2

Change-Id: Icbbd8a27c330dcdf2062b187b3208409afdb2d4c