Merge "WTF when device has no persistent periodic syncs..." into oc-dr1-dev