Merge "Revert "On-device signing: Add TEST_MAPPING.""