Merge "Search for RRO both in SKU subdir and in vendor/overlay" into cw-f-dev