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

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