Fix build errors and add missing Features

Change-Id: Iaf3c94e094cba5791236812266203b046bd72311
Get MultiUser back

Change-Id: I90e6a53b59030f506550f39df345eadc1d6f04d3