am f2156962: am ba5802c0: am 6d49184b: Merge "Workaround stack overflow issue with clang"

* commit 'f21569623b0f33a097954092d1ee3fa32e9e3ce2':
  Workaround stack overflow issue with clang