Merge "Chanage uid to userId where it denotes an Android user id."