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

Change-Id: I07e8c932b5d11dd6f3c14e73a892d245b6c541a8