am a6d5109d: Merge "Fix for bug 8578258." into jb-mr2-dev

* commit 'a6d5109dd69791ba51e469c30d522dc27ab2c69c':
  Fix for bug 8578258.