Merge "Update binder-related  policy."