Merge "API CHANGE - Add hasGrantedPolicy() API"