[automerger skipped] Merge "Enable System User Home for CSI" am: c27232bf33 am: 316255b845 -s ours

am skip reason: Change-Id I0f999f76e23c6316f6d5d0741a1116028e34a0ab with SHA-1 fd2f5f66f9 is in history

Change-Id: I5f2de1ed42577fa0cfce634ef343c18f6fddc5b1