am f330b539: am a2c628fb: Merge "Fix bug 6499508" into jb-dev

* commit 'f330b53955461e0fca01a5ca6f6d90429815a30a':
  Fix bug 6499508