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

Change-Id: Ie1f21a25f5ec12e84a95c62f12396cd3c9ec282e