Revert "Drop a few unnecessary modules" am: 9f89d8b7f2
am: 46879d6863

Change-Id: I27bf035273c51a128a0fe847d568ce14bd7f4157