Squashed 'Ammo/' changes from 45b14cc..6e9b77d

6e9b77d prod-Ammo: Updated prod version of Ammo at version 0.21.

git-subtree-dir: Ammo
git-subtree-split: 6e9b77db36d767a9d4b2e5c91c2b0cd5122ba7a8