[automerger skipped] Added option to pre-create user templates to optimize first user creation time. am: 7ad2f6bdad
am: 6400043a6e -s ours
am skip reason: change_id I81de1b5376dc9c42b63be8853d7204c88826401f with SHA1 c1ca4410e1 is in history

Change-Id: I9e3b9f9960f03dbd8eb8ad13e72c4062428e716e