Merge "Split resolved-policy to provided and consumed"