Merge "Trim invalid users" into oc-mr1-dev
am: 302a7bd34d

Change-Id: I4c02e8f71dfdad7eb69febe06fd23deed20a11d2