Merge "Fail when there is an ASM error" am: 4152497b4b am: 05bb83c87d
am: 5fb872e787

Change-Id: I63222e0f376184649f8634932edc6ee296418b91