Merge "Fix for PS setup crash in AOSP build" into main