Merge "Fail when there is an ASM error"
am: 4152497b4b

Change-Id: Ic5ca952591fa235c7e4a28d95d9b1cb1d4644f8a