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

Change-Id: I20d96f757430bf020a2ce8c581b0657f7065efb4