Namespace fix

Change-Id: Ia2000c93a4688a442d821933920d0d2cbf3f297f
Merge "Namespace fix"