am 480d6eb9: Merge "Fix negative inactiveTime on creating a new user" into mnc-dev

* commit '480d6eb953aa12a495a080557d4ea84782db2328':
  Fix negative inactiveTime on creating a new user