Merge "Update UID routing to upstream implementation."
am: b072143d78

Change-Id: I9e0e35a8aae8921206e937757db49e19484a460b