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

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