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

Change-Id: I8b65d5bb4e8eb701c7b1af0f2df788329cfe2de1