Merge "[automerger skipped] Merge "[security] Make frro iteration thread-safe" into tm-qpr-dev am: ed1e6ae4cb am: 1d178b3ba9 -s ours"