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

Change-Id: Iba179d56d21f5d6a48bf289afdf1d27cc8668d44