Merge "ARM: Avoid branches to branches" am: e21c9af9a8 am: 4da3187888
am: bc7a6a3e01

Change-Id: Ibb5f34e1ecd1b0256582c631e826f716092181ad