am 37d0e13a: am 572a78cd: am 9d4cad8b: am b1cebd9e: am 5579e41c: Add op package to the UID special case handling in account manager.

* commit '37d0e13ad3be7fddbce991bef263ac4375e28c22':
  Add op package to the UID special case handling in account manager.