Remove repetitive namespace close / re-open & unindent.

Change-Id: I453084b3b034a04305058da404b334c7016559ce