Merge "configs: bengal bringup changes"