Merge "Sanity check users before committing new Android ID" into klp-dev