Add userId to log messages - DO NOT MERGE am: c4d9e91f85

Change-Id: I37baf8357d6ec1b0a95b5d6f80d4feeaa6cf6781