am 85fdc823: am df171680: am 009ec47d: am 7c761052: am 8114da7b: resolved conflicts for merge of 590e76dd to jb-mr1-dev-plus-aosp

* commit '85fdc823ed811a2a45474aa207dc16342425cef0':
  DO NOT MERGE: Add a way to get all values of an attribute of DN.