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

Change-Id: I6c6123fc5a90d2d58ec3e8201ac7f7cfc7658d75