Merge "Update the settings due to a framework API change."