Merge "Update FakeUid with new methods" into nyc-mr1-dev