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

Change-Id: I3329767ddeb98e93afd63b407f89f868f9f760f0