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

Change-Id: I04e427a0dc3632d21e15a6738ed77a6ee2864fcc