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

Change-Id: I94b9060a7dd09082f8e8cc6e42bed54c5107c8c8