Merge "Enable System User Home for CSI" am: c27232bf33

Change-Id: Ifbc1b313094c36baaa126d02be5c3ee0e00fe831