am cb09dba0: am 69fbc3c0: Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev

* commit 'cb09dba0b80ff51e0a481959c5f0056f7a292ea7':
  Revert "Fix for bug 6050753."