Merge "Improvements on ACTION_REQUEST_SET_AUTOFILL_SERVICE:" into oc-dev