Revert "Revert "Merge pull request #24733 from gaye/reland-amd""

This reverts commit 1b02818f092d4699a864976729ac924e5f0f9499.
Bug 1027707 - jrburke followup to handle PRODUCTION=1 builds using rjs
Bug 1027707 - Followup to turn off debug logging for authentication data
Merge pull request #24898 from gaye/re-reland-amd

Bug 1027707 - Re reland amd