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

Change-Id: Id0a11d3797830c8f3178972b664f710e947030c6