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

Change-Id: Ic4f1fe2ee319b1158980cba3e22e55179bbb7cf8