Merge "Expose APIs for Settings"