Merge "Always log new user state to event log" into oc-dev am: 6db4406fbd
am: 62b76a388f

Change-Id: Idaa6c938594b49acb233b64f611e050d0e8f5558