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

Change-Id: I844c3ce38c09733e3855502672f1eecc001d6ce1