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

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