Merge "ART: Change behavior for rethrowing init failures (2)" am: ef7ef4ce04 am: a62884320b
am: 10b1583fea

* commit '10b1583feafb1fb7e956d963a480ceffe3a1bb3a':
  ART: Change behavior for rethrowing init failures (2)