am 1eb2064f: am 7229e29f: Merge "Ensure all active Device Admins are listed." into jb-mr2-dev

* commit '1eb2064ff495b60bbf5db1a188adcad2e677742b':
  Ensure all active Device Admins are listed.