Merge "Temporary disable linker-namespaces" am: 9fb5047549
am: 4bbed77aaf

* commit '4bbed77aaf4dfa813112e5539ee6c00e1b7257d9':
  Temporary disable linker-namespaces