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

Change-Id: Iee93cd8dd4271796fc6e10292b23706fd27bda90