Enable modules

Change-Id: Ic99fd75f230e52bf0650e4fa66b41f4f90b4f127