Merge "Add self update permission"