Merge "Storing resolved PolicyInfo in Datastore"