Merge "Ensuring USAGE_ACCESS_SETTINGS exists"