mondrianwifi: Enable multiple user accounts

Change-Id: I50046d94a5202460bc67843ad3e791632d946da1
Merge branch 'crpalmer' into HEAD