Merge "Fix duplicate array key of namespace stuffs"