Merge "Persist functions for oemOverride across reboot"