Merge "Set up default (random) Android IDs for all users" into jb-mr1-dev