Merge "Add reserved permission flag values for the permission controller"