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

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