Merge "Fixing APEX and Distribution csit failures due to invalid key name in policy"