Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev
am: 6b4f0bb6fe

Change-Id: Id069c0fd99a3a1b9ebd429c7f44542a2ae068926