Merge "Don't create anonymous namespace" am: d82eb35c76 am: bba48e1671
am: 359f39d2a1

Change-Id: I35f2b6b7a167f8ad5bd939c4ccc4044604ad40fb