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

Change-Id: I6abfb8e541ba3fbb8c7c7a0cc1d9ad40079e0a9e