Merge "Don't create anonymous namespace" am: 085a0b4404
am: 4b1462c00d

Change-Id: Ic7d0b549fd2ff741c8f27ffbf29a1f3d41320448