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

Change-Id: I6414f70eaa67f0d09461e9986860bffd14981184