Merge "Always send userId to FaceService" into qt-r1-dev am: e5c0b58738
am: 6c848ed8b7

Change-Id: I2ea9db58dc43c41dcbf35a93a363841043ecbe80