overlay: add multiuser support

Change-Id: I376c52a699e670553df1e4a1cfbbd1cf7be5c142
Merge branch 'cm' into HEAD