Merge "Enable System User Home for CSI" into rvc-dev am: 10e9c219a1 am: 30d982cb2b

Change-Id: I6d11fe24bb2153645dff3ddd459f303f6ddc905e