am 6d5d7fcb: am 52177738: Merge "Fix issue #7296314, issue #7296314." into jb-mr1-dev

* commit '6d5d7fcba944e772041f20022ac275a2ac057eb5':
  Fix issue #7296314, issue #7296314.