am 341aa8e0: Merge "Potential fix for bug 7352816" into jb-mr1-dev

* commit '341aa8e0e8753ddb5eca22311e7d671e0518f326':
  Potential fix for bug 7352816