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

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