Merge "Add userId to log messages - DO NOT MERGE" into rvc-dev am: 5191bb759f

Change-Id: I1a2f1d75aa34998c47c3704650293e12d6c0cc3a