am 681b21f3: resolved conflicts for merge of 5d21820a to jb-mr2-dev

* commit '681b21f3e4ef0a63d982eca0e9d1896422bc30ff':
  Permit deactivation of malformed Device Admins.