Ambient Support

General MR

Summary

Small tweaks to make tests pass in ambient mode

Relevant logs/screenshots

Linked Issue

issue

Umbrella Branch

ambient-for-all

Upgrade Notices

N/A