ART: Remove FailOrAbort for unnecessary cases am: 147a911636 am: 177a8c1e3b
am: 1d44310603

Change-Id: I06d732d1316e99e6c151938e73e76f33b928f78e