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

Change-Id: I6eb4d79279322932bb8ac61ade9c67817570edf8