am 47e1c0bd: Merge "Tighten locking around data usage UID resolution."

* commit '47e1c0bd47796fcd2b15423ba64e68a4df6e00a8':
  Tighten locking around data usage UID resolution.