am 61d91058: am eff64986: Merge "Do not call out of the settings provider with...
am 61d91058: am eff64986: Merge "Do not call out of the settings provider with a lock held" into mnc-dev
* commit '61d91058':
Do not call out of the settings provider with a lock held