6ecab77d02 was cherry-picked from
master and causes a build failure because it uses a multi-catch
statement that is not supported in source version 1.6.  On master
the Java source version is 1.7 which is why it builds there.
Change-Id: Ia43c2c6b9068553635a5ddd5bc4129ddf5c1fd35