Merge "Persist settings on a dedicated background thread am: 82b8c92b97 am: b3f1e67921" into nyc-mr1-dev-plus-aosp