am bf11852a: merge from open-source master

Merge commit 'bf11852aa3b56f1f77841dd0dbb3cc984711d674' into kraken

* commit 'bf11852aa3b56f1f77841dd0dbb3cc984711d674':
  Fix for use of UNPREDICTABLE register combination