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

* commit '6edbfb9cdc4d3a83d424565371e78dcdb9a0bb30':
  Fix for bug 8578258.