Update CN to master to resolve namespace issue

Change-Id: I88bac9505440e276b145d26ace647593bd5a6851
Merge "Update CN to master to resolve namespace issue" into wmf/1.21wmf7