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

Change-Id: Id16416f5fdbcb73ba851827ec817fbfa0f0d2ee0