OP-421: Checkpoint 4: All Legacy Prefs converted to Java