Refactor RD to take same codepath for single and comp pred Change-Id: Id38baf1b89648ef534e28be72f583137871f920c