Merge "Update FakeUid to include new methods." into oc-dev
am: 129369e58e

Change-Id: I0f6ac2bd7ba43d31843c61b0478cfd39fb20da0d