Merge \"Don\'t reuse userids that are being cleaned up on boot\" into nyc-mr1-dev
am: 88a4c5ba4e

Change-Id: Ifb86a71c449d02ae4732bd214e9651c86eef8b6a