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

Change-Id: I5498e5a3796a463501917874772be335785e1ca4