remove local multiuser definition

Change-Id: I61c631e96849946b59dc7e7a473873ed1bc9510f
Merge branch 'remote' into mkl