Merge "Return actual userId when File Based Encryption is present"