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

* commit '161194daad7cee031475648be294e5e9d4bc6d68':
  Fix infinite recursive loop