Merge "Change some rule in Pbap to fix Test case issues"