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

Change-Id: Ifabee2678492d774aa8ec59e84d0514e56816fb2