Merge "Merge "WTF when device has no persistent periodic syncs..." into oc-dr1-dev am: 7b0dec41" into oc-dr1-dev-plus-aosp