Allow flavor and image names in CS resource

Closes-Bug: #1236962
Change-Id: I2af3fb1d50badcc6bf89719cfa377356821191f7
Merge "Allow flavor and image names in CS resource"