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

Change-Id: I2a9b37d05e1605cd6cc7f416d8bc6e71c950339b