Merge "Merge "Merge "WTF when device has no persistent periodic syncs..." into...
Merge "Merge "Merge "WTF when device has no persistent periodic syncs..." into oc-dr1-dev am: 7b0dec41" into oc-dr1-dev-plus-aosp am: 39af219c" into oc-mr1-dev-plus-aosp
am: 32755985
Change-Id: Iad2f1fa7c3ebad8860e8e8459c462cbe54a5589d