am dfec1c21: fix for COMPILER-8912

* commit 'dfec1c218c7a78adb160e74eece66a1e0ffb99f1':
  fix for COMPILER-8912