Merge "Don't abort on errors"
am: d7bf23ae7b

Change-Id: Ib066b4a41e4fdc075d6e39c8a1cfaa252eecc769