Merge "Avoid APF JNEBS instruction with R1 as it doesn\'t work" into nyc-dev
am: 520ae86

* commit '520ae86666164adce825131703db42af5f2beaa6':
  Avoid APF JNEBS instruction with R1 as it doesn't work

Change-Id: I45b0356dda8be726b07c28362b434c0a6fa7ea1b