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

Change-Id: If582e61ca92e5414edea351934053fa0ab6b04bf