Merge "Don\'t bind ChooserTargetServices as user CURRENT" into nyc-dev
am: 0cc531a

* commit '0cc531ae31e1bb13ecca2cdcd8ddb296542362e0':
  Don't bind ChooserTargetServices as user CURRENT