Merge "Make ParseException less useless." am: 8e8ed1dfc2
am: 55fae4c14c

Change-Id: I045520c106529c266f5e06f29bb32cf078df7f8b