Merge "Fix FakeUid implementation"