Add support for MultiUser

Change-Id: Ie49929e5adc5f4767f1607287880a0dc8d1e17fd