Fix namespace issue

Change-Id: I77ecaa51e57217afe865e982af274af0481c194f