Merge "Modify the dso rule to allow spaces in [] names." am: 07bf64b28a am: 79266dd407
am: 523c85f398

* commit '523c85f3989a507c2f4557addeb65a95f01fe09d':
  Modify the dso rule to allow spaces in [] names.