Update CN to master to resolve namespace issue

Change-Id: I7988e8529b899590ed618a996fa69b4de81ad3c1