Merge "Merge "Always log new user state to event log" into oc-dev am: 6db4406f" into oc-dr1-dev am: 111041d6 am: cd40b999 Change-Id: I3289bd13dfce2de8cf0ae406a56af3eed36d28b5