Merge "Update FakeUid to include new methods." into oc-dev