Merge "Adding fully qualified resource names such that these will support RRO checks"