Merge "Rename functions, variables, etc related to policy decision." into devel/master