Merge "Make anonymous namespace isoalted." am: 6b0f17e588 am: e16a6463d9
am: a6508f2b15

Change-Id: Ieda4f662c68f5910ee90391dd29cc23c93dbf3eb