Merge "Adding a util to extract Context.getUserId()"