Fix NS of class

Change-Id: I419db6d6aa3bf55d0ad26cbd7ebbef71ddb54a0f
Merge "Fix NS of class"