am 21243369: Merge "Fix infinite recursive loop"

* commit '2124336984cb6c189f03c271636a1cc8babb2371':
  Fix infinite recursive loop