Added CNAME back.

Change-Id: I6f006c7242f8ca8c522702edd9f51199315cb93d