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

Change-Id: I1cac59d7ec4b99b6b663f05d01195851c4497893