am 1070edc5: am 950435bb: Merge "cherry pick: Fix potential looping issue" into jb-mr1-dev

* commit '1070edc57c3dba9e8b550f61c520de21023f1c08':
  cherry pick: Fix potential looping issue