Merge "Remove deprecated Settings APIs."