Merge "[RCS] Use correct config for PLANI"