Merge "Update FakeUid to match ag/2099507" into oc-dev