Merge "If branch changer which changes the opcodes." am: 5f17267621
am: 33e9cb899f

Change-Id: I5a46a6afd9bff88b172d3959a4237fda1511e14d