Merge "Code cleanup: remove unused members in RD_OPT"