am 0b399b17: Merge change I96e99082 into eclair

Merge commit '0b399b1717b3b07a97266b93909602cbbb1f47be' into eclair-plus-aosp

* commit '0b399b1717b3b07a97266b93909602cbbb1f47be':
  [Issue 2171774] Fixing the fixStructuredNameComponents() method