Merge "Merge "Additional log instrumentation for multi-user" into oc-dev am: dadc05635a am: f2ffdb28a4"