am 3b2b3aaf: am 47a8e863: Merge "Fix infinite recursive loop DO NOT MERGE" into jb-mr1.1-dev

* commit '3b2b3aaf9f37dd8e971f2846236dc551d5e38666':
  Fix infinite recursive loop DO NOT MERGE