am 9d5182f9: am 11f2b42d: Remove system user id for cm tests

* commit '9d5182f9db9a0bdff8700006bc6b84906a842c8e':
  Remove system user id for cm tests