am a1240184: Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1

* commit 'a1240184efd1d4391540a6e3e9cae50d56d05cb2':
  Fix issue #5433192 and maybe #5433192