am d8a6b544: am 21243369: Merge "Fix infinite recursive loop"

* commit 'd8a6b5445c070e1ab5d86a87e6669340591625d7':
  Fix infinite recursive loop