Merge "Merge "Always log new user state to event log" into oc-dev am: 6db4406fbd" into oc-dr1-dev
am: 111041d62f

Change-Id: I554a0331c43dbb56de220670d92c7796a010b3a9